Blackfin: linker scripts: force start.o and set initcode boundaries

Make sure that the start.o object is always the first object in our linker
script regardless of configuration settings, and add some linker symbols
so the ldr utility can properly locate the initcode when generating a LDR.

Signed-off-by: Mike Frysinger <[email protected]>

diff --git a/board/bf533-ezkit/u-boot.lds.S b/board/bf533-ezkit/u-boot.lds.S
index 538a19f81b46ebc8b0f1c1364ec4e3b89b7608ee..70764acf1ab4eca3494cc56aaef8cfa1d43c58b9 100644 (file)
--- a/board/bf533-ezkit/u-boot.lds.S
+++ b/board/bf533-ezkit/u-boot.lds.S
@@ -54,6 +54,8 @@ SECTIONS
 {
        .text :
        {
+               cpu/blackfin/start.o (.text)
+
 #ifdef ENV_IS_EMBEDDED
                /* WARNING - the following is hand-optimized to fit within
                 * the sector before the environment sector. If it throws
@@ -61,7 +63,6 @@ SECTIONS
                 * it linked after the configuration sector.
                 */
 
-               cpu/blackfin/start.o            (.text)
                cpu/blackfin/traps.o            (.text)
                cpu/blackfin/interrupt.o        (.text)
                cpu/blackfin/serial.o           (.text)
@@ -74,6 +75,10 @@ SECTIONS
                common/env_embedded.o   (.text)
 #endif
 
+               __initcode_start = .;
+               cpu/blackfin/initcode.o (.text)
+               __initcode_end = .;
+
                *(.text .text.*)
        } >ram
 

diff --git a/board/bf533-stamp/u-boot.lds.S b/board/bf533-stamp/u-boot.lds.S
index 97ebd79260135e6ce1f08b11349a788f31526ed0..187309f3fcff65af51df5a9d2eff2ba612dc3375 100644 (file)
--- a/board/bf533-stamp/u-boot.lds.S
+++ b/board/bf533-stamp/u-boot.lds.S
@@ -54,6 +54,8 @@ SECTIONS
 {
        .text :
        {
+               cpu/blackfin/start.o (.text)
+
 #ifdef ENV_IS_EMBEDDED
                /* WARNING - the following is hand-optimized to fit within
                 * the sector before the environment sector. If it throws
@@ -61,7 +63,6 @@ SECTIONS
                 * it linked after the configuration sector.
                 */
 
-               cpu/blackfin/start.o            (.text)
                cpu/blackfin/traps.o            (.text)
                cpu/blackfin/interrupt.o        (.text)
                cpu/blackfin/serial.o           (.text)
@@ -72,6 +73,10 @@ SECTIONS
                common/env_embedded.o   (.text)
 #endif
 
+               __initcode_start = .;
+               cpu/blackfin/initcode.o (.text)
+               __initcode_end = .;
+
                *(.text .text.*)
        } >ram
 

diff --git a/board/bf537-stamp/u-boot.lds.S b/board/bf537-stamp/u-boot.lds.S
index 97ebd79260135e6ce1f08b11349a788f31526ed0..187309f3fcff65af51df5a9d2eff2ba612dc3375 100644 (file)
--- a/board/bf537-stamp/u-boot.lds.S
+++ b/board/bf537-stamp/u-boot.lds.S
@@ -54,6 +54,8 @@ SECTIONS
 {
        .text :
        {
+               cpu/blackfin/start.o (.text)
+
 #ifdef ENV_IS_EMBEDDED
                /* WARNING - the following is hand-optimized to fit within
                 * the sector before the environment sector. If it throws
@@ -61,7 +63,6 @@ SECTIONS
                 * it linked after the configuration sector.
                 */
 
-               cpu/blackfin/start.o            (.text)
                cpu/blackfin/traps.o            (.text)
                cpu/blackfin/interrupt.o        (.text)
                cpu/blackfin/serial.o           (.text)
@@ -72,6 +73,10 @@ SECTIONS
                common/env_embedded.o   (.text)
 #endif
 
+               __initcode_start = .;
+               cpu/blackfin/initcode.o (.text)
+               __initcode_end = .;
+
                *(.text .text.*)
        } >ram
 

diff --git a/board/bf561-ezkit/u-boot.lds.S b/board/bf561-ezkit/u-boot.lds.S
index 3defef45ae28add44c63cb9e7ec4c2a9f5986f25..99d6be634f5fdc49f06332418d02f955738b5a66 100644 (file)
--- a/board/bf561-ezkit/u-boot.lds.S
+++ b/board/bf561-ezkit/u-boot.lds.S
@@ -54,6 +54,8 @@ SECTIONS
 {
        .text :
        {
+               cpu/blackfin/start.o (.text)
+
 #ifdef ENV_IS_EMBEDDED
                /* WARNING - the following is hand-optimized to fit within
                 * the sector before the environment sector. If it throws
@@ -61,7 +63,6 @@ SECTIONS
                 * it linked after the configuration sector.
                 */
 
-               cpu/blackfin/start.o            (.text)
                cpu/blackfin/traps.o            (.text)
                cpu/blackfin/interrupt.o        (.text)
                cpu/blackfin/serial.o           (.text)
@@ -74,6 +75,10 @@ SECTIONS
                common/env_embedded.o   (.text)
 #endif
 
+               __initcode_start = .;
+               cpu/blackfin/initcode.o (.text)
+               __initcode_end = .;
+
                *(.text .text.*)
        } >ram